Match the effect of FULLSCREEN_BOTH and FULLSCREEN_MAXIMIZED to docs on Windows.

 src/w32term.c (w32fullscreen_hook): Swap FULLSCREEN_BOTH and
 FULLSCREEN_MAXIMIZED.

diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi
index 7d56d38ffad1f717e9311cc431d0fd5b47123ffd..01d2d1d6c452e41a7344f92f9c5d13040b075089 100644 (file)
--- a/doc/lispref/frames.texi
+++ b/doc/lispref/frames.texi
@@ -632,8 +632,9 @@ possible.  The value @code{fullboth} specifies that both the width and
 the height shall be set to the size of the screen.  The value
 @code{maximized} specifies that the frame shall be maximized.  The
 difference between @code{maximized} and @code{fullboth} is that the
-former still has window manager decorations while the latter really
-covers the whole screen.
+former can still be resized by dragging window manager decorations
+with the mouse, while the latter really covers the whole screen and
+does not allow resizing by mouse dragging.
 @end table
 
 @node Layout Parameters

diff --git a/src/ChangeLog b/src/ChangeLog
index 8de4b0f47d3a257c0096bd056df553f9feaaeed5..d1d1ea674c500ce1e18cc3a1f8759769a8d61dcf 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-15  Eli Zaretskii  <eliz@gnu.org>
+
+       * w32term.c (w32fullscreen_hook): Swap FULLSCREEN_BOTH and
+       FULLSCREEN_MAXIMIZED.  (Bug#13935)
+
 2013-03-15  Dmitry Antipov  <dmantipov@yandex.ru>
 
        * region-cache.c (find_cache_boundary, move_cache_gap)

diff --git a/src/w32term.c b/src/w32term.c
index 6b51777839f7f380c6a4c509e5838511f44b49ca..989ceb0f84770c12c9711e6f21f6411fda28e3ba 100644 (file)
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -5682,10 +5682,10 @@ w32fullscreen_hook (FRAME_PTR f)
 
       switch (f->want_fullscreen)
        {
-       case FULLSCREEN_MAXIMIZED:
+       case FULLSCREEN_BOTH:
          PostMessage (FRAME_W32_WINDOW (f), WM_SYSCOMMAND, SC_MAXIMIZE, 0);
          break;
-       case FULLSCREEN_BOTH:
+       case FULLSCREEN_MAXIMIZED:
          height =
            FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (f, pixel_height)
            - XINT (Ftool_bar_lines_needed (selected_frame))